From aaa66ea658f7c5b8fac8ce4b3c02bd94bafdff8e Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 22 Nov 2022 12:09:44 -0800 Subject: clean up request flow, update translations and deps --- src/routes/(app)/[username]/request/[id]/+page.server.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/routes/(app)/[username]/request/[id]/+page.server.js') diff --git a/src/routes/(app)/[username]/request/[id]/+page.server.js b/src/routes/(app)/[username]/request/[id]/+page.server.js index 8245bef6..7beabfe6 100644 --- a/src/routes/(app)/[username]/request/[id]/+page.server.js +++ b/src/routes/(app)/[username]/request/[id]/+page.server.js @@ -10,10 +10,13 @@ export let load = async ({ cookies, depends, locals: { user }, params }) => { if (invoice) { let { amount, received, uuid } = invoice; - if ((received && !amount) || received >= amount) throw redirect(307, `/send/${uuid}`); + if ( + request.recipient.username === user.username && + ((received && !amount) || received >= amount) + ) + throw redirect(307, `/invoice/${uuid}/paid`); - if (request.requester.username === user.username) - throw redirect(307, `/send/${request.invoice.uuid}`); + if (request.requester.username === user.username) throw redirect(307, `/send/${uuid}`); } return { request }; -- cgit v1.2.3